From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Tue, 24 Sep 2019 19:09:57 +0000 (+0100)
Subject: kfreebsd-libcxx-threads-detection
X-Git-Tag: archive/raspbian/1%10.0.0-1+rpi1^2~25
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=eee72f8d36ee67e0fdb2faf38346376dfae393ba;p=llvm-toolchain-10.git

kfreebsd-libcxx-threads-detection

===================================================================

Gbp-Pq: Topic kfreebsd
Gbp-Pq: Name kfreebsd-libcxx-threads-detection.diff
---

diff --git a/libcxx/include/__config b/libcxx/include/__config
index 1ecced9f4..f74a4b58b 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1065,6 +1065,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
     !defined(_LIBCPP_HAS_THREAD_API_WIN32) && \
     !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
 #  if defined(__FreeBSD__) || \
+      defined(__FreeBSD_kernel__) || \
       defined(__Fuchsia__) || \
       defined(__wasi__) || \
       defined(__NetBSD__) || \